Revert "styleproperties: don't force replacing the font description"

It turns out the bug is more complicated than I originally understood.
Not replacing the font description fields while merging here makes it
impossible for application's CSS to override fonts.

This reverts commit 89c1d93b68aaaebeb5db0dc2a58895721c6665aa.

https://bugzilla.gnome.org/show_bug.cgi?id=645458

diff --git a/gtk/gtkstyleproperties.c b/gtk/gtkstyleproperties.c
index c89b31a3b5e4b09608f0dc3b9cff9a43c4dadbc8..38ededc295ee0b5ceacf1c9c73223894bf8ee681 100644 (file)
--- a/gtk/gtkstyleproperties.c
+++ b/gtk/gtkstyleproperties.c
@@ -1243,7 +1243,7 @@ gtk_style_properties_merge (GtkStyleProperties       *props,
               font_desc = g_value_get_boxed (value);
               font_desc_to_merge = g_value_get_boxed (&data->value);
 
-              pango_font_description_merge (font_desc, font_desc_to_merge, FALSE);
+              pango_font_description_merge (font_desc, font_desc_to_merge, replace);
             }
           else if (G_VALUE_TYPE (&data->value) == G_TYPE_PTR_ARRAY &&
                    G_IS_VALUE (value))